From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Wed, 14 Feb 2007 19:17:41 +0000 (+0000)
Subject: Export PRI_xen_pfn rather than PRIpfn: less polluting of namespace.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15318^2~57
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=6422b05e1113641c212ba3bbffabb13079488421;p=xen.git

Export PRI_xen_pfn rather than PRIpfn: less polluting of namespace.
libxc continues to use PRIpfn internally, #defined to PRI_xen_pfn.

Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h
index 98f8f11d7f..931d96acaf 100644
--- a/tools/libxc/xc_dom.h
+++ b/tools/libxc/xc_dom.h
@@ -7,6 +7,8 @@
 typedef uint64_t xen_vaddr_t;
 typedef uint64_t xen_paddr_t;
 
+#define PRIpfn PRI_xen_pfn
+
 struct xc_dom_seg {
     xen_vaddr_t vstart;
     xen_vaddr_t vend;
diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index b4dfea6285..8c6aaed356 100644
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -57,7 +57,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
-#define PRIpfn "lx"
+#define PRI_xen_pfn "lx"
 #endif
 
 /* Arch specific VIRQs definition */
diff --git a/xen/include/public/arch-powerpc.h b/xen/include/public/arch-powerpc.h
index a6280745a3..3f6b993050 100644
--- a/xen/include/public/arch-powerpc.h
+++ b/xen/include/public/arch-powerpc.h
@@ -56,7 +56,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
-#define PRIpfn "llx"
+#define PRI_xen_pfn "llx"
 #endif
 
 /*
diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h
index 8053262672..22fcd69a65 100644
--- a/xen/include/public/arch-x86/xen.h
+++ b/xen/include/public/arch-x86/xen.h
@@ -61,7 +61,7 @@ DEFINE_XEN_GUEST_HANDLE(void);
 
 typedef unsigned long xen_pfn_t;
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
-#define PRIpfn "lx"
+#define PRI_xen_pfn "lx"
 #endif
 
 /*